projects
/
emacs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5dd4f3f
)
* window.c: Fix error introduced by previous patch.
author
Tom Tromey
<tromey@redhat.com>
Wed, 19 Jan 2011 15:06:24 +0000
(08:06 -0700)
committer
Tom Tromey
<tromey@redhat.com>
Wed, 19 Jan 2011 15:06:24 +0000
(08:06 -0700)
src/ChangeLog
patch
|
blob
|
history
src/window.c
patch
|
blob
|
history
diff --git
a/src/ChangeLog
b/src/ChangeLog
index 02887713397b5fd0f026f7a6e22de67b0e9fbd07..221ad6942190f324dc959de77869e9e4d23705ac 100644
(file)
--- a/
src/ChangeLog
+++ b/
src/ChangeLog
@@
-1,3
+1,7
@@
+2011-01-19 Tom Tromey <tromey@redhat.com>
+
+ * window.c: Fix error introduced by previous patch.
+
2011-01-18 Tom Tromey <tromey@parfait>
* globals.h: New file.
diff --git
a/src/window.c
b/src/window.c
index 1dd824eeb6fb92367fd55976ad685331f8fcb221..22e3f3d88181f15268726471c08c61cddc31afbd 100644
(file)
--- a/
src/window.c
+++ b/
src/window.c
@@
-151,7
+151,7
@@
static int window_scroll_preserve_vpos;
#if 0 /* This isn't used anywhere. */
/* Nonzero means we can split a frame even if it is "unsplittable". */
static int inhibit_frame_unsplittable;
-#endif
extern Lisp_Object Qwindow_scroll_functions, Vwindow_scroll_functions;
+#endif
\f
DEFUN ("windowp", Fwindowp, Swindowp, 1, 1, 0,